From: Olaf Hering Date: Mon, 17 Jan 2011 18:05:52 +0000 (+0000) Subject: tools/hotplug/Linux: allow hardlinked files for block device images X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~10912 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=86e440aebc540486dc37fa72f0e7b03dafd616e9;p=xen.git tools/hotplug/Linux: allow hardlinked files for block device images tools/hotplug/Linux/block change for this losetup -a output: (inode 12 is listed twice due to hardlinks) /dev/loop0: [0809]:139267 (/abuild/vdisk-sles11_2-disk0) /dev/loop1: [0809]:139266 (/abuild/vdisk-sles11_1-disk1) /dev/loop3: [0809]:139267 (/abuild/vdisk-sles11_2-disk0) /dev/loop5: [0809]:139273 (/abuild/vdisk-sles11_5-disk1) /dev/loop8: [0809]:12 (/abuild/bootiso-xenpaging-sles11_5.iso) /dev/loop10: [0809]:12 (/abuild/bootiso-xenpaging-sles11_4.iso) /dev/loop11: [0809]:139271 (/abuild/vdisk-sles11_4-disk0) Without this change, $dev would contain /dev/loop8\n/dev/loop10 Applies to 4.0 and 4.1 Signed-off-by: Olaf Hering Acked-by: Stefano Stabellini --- diff --git a/tools/hotplug/Linux/block b/tools/hotplug/Linux/block index 122e93e35b..06de5c92a2 100644 --- a/tools/hotplug/Linux/block +++ b/tools/hotplug/Linux/block @@ -279,8 +279,8 @@ mount it read-write in a guest domain." fatal "Unable to lookup $file: dev: $dev inode: $inode" fi - shared_list=$(losetup -a | grep ' \[0*'${dev}'\]:'${inode} | - cut -d : -f 1) + shared_list=$(losetup -a | + sed -n -e "s@^\([^:]\+\)\(:[[:blank:]]\[${dev}\]:${inode}[[:blank:]](${file})\)@\1@p" ) for dev in "$shared_list" do if [ -n "$dev" ]